From: Yang Zhang Date: Tue, 29 Oct 2013 08:55:23 +0000 (+0100) Subject: VMX: Eliminate cr3 store/load vmexit when UG enabled X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~6119 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=c9efe34c119418a5ac776e5d91aeefcce4576518;p=xen.git VMX: Eliminate cr3 store/load vmexit when UG enabled With the feature of unrestricted guest, Xen should not cause vmexits for cr3 accesses in non-paging mode. Signed-off-by: Yang Zhang Acked-by: Jun Nakajima --- diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index 9ca863248c..502caa3984 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -1086,7 +1086,7 @@ static void vmx_update_guest_cr(struct vcpu *v, unsigned int cr) uint32_t cr3_ctls = (CPU_BASED_CR3_LOAD_EXITING | CPU_BASED_CR3_STORE_EXITING); v->arch.hvm_vmx.exec_control &= ~cr3_ctls; - if ( !hvm_paging_enabled(v) ) + if ( !hvm_paging_enabled(v) && !vmx_unrestricted_guest(v) ) v->arch.hvm_vmx.exec_control |= cr3_ctls; /* Trap CR3 updates if CR3 memory events are enabled. */ @@ -1156,7 +1156,7 @@ static void vmx_update_guest_cr(struct vcpu *v, unsigned int cr) case 3: if ( paging_mode_hap(v->domain) ) { - if ( !hvm_paging_enabled(v) ) + if ( !hvm_paging_enabled(v) && !vmx_unrestricted_guest(v) ) v->arch.hvm_vcpu.hw_cr[3] = v->domain->arch.hvm_domain.params[HVM_PARAM_IDENT_PT]; vmx_load_pdptrs(v); @@ -2408,7 +2408,7 @@ void vmx_vmexit_handler(struct cpu_user_regs *regs) hvm_invalidate_regs_fields(regs); - if ( paging_mode_hap(v->domain) && hvm_paging_enabled(v) ) + if ( paging_mode_hap(v->domain) ) { __vmread(GUEST_CR3, &v->arch.hvm_vcpu.hw_cr[3]); v->arch.hvm_vcpu.guest_cr[3] = v->arch.hvm_vcpu.hw_cr[3];